Implement _gdk_win32_window_destroy() and more cleanup
authorHans Breuer <hans@breuer.org>
Sun, 12 Jul 2009 20:32:28 +0000 (22:32 +0200)
committerHans Breuer <hans@breuer.org>
Mon, 13 Jul 2009 07:45:07 +0000 (09:45 +0200)
Implement _gdk_win32_window_destroy() by just renaming
_gdk_windowing_window_destroy(), removed superfuous stub.

Also cleaned up implementations of  gdk_win32_window_set_background()
and gdk_win32_window_set_back_pixmap() - removed stuff now done at the
respective gdk_window_*() function.

gdk/win32/gdkwindow-win32.c

index 91a70e0d352018c71fc130e991a45293b0510a11..d1d151c16335bbebb2f9014ddb0c2ad267a675e7 100644 (file)
@@ -781,7 +781,7 @@ gdk_window_lookup (GdkNativeWindow hwnd)
 }
 
 void
-_gdk_windowing_window_destroy (GdkWindow *window,
+_gdk_win32_window_destroy (GdkWindow *window,
                               gboolean   recursing,
                               gboolean   foreign_destroy)
 {
@@ -1866,7 +1866,6 @@ static void
 gdk_win32_window_set_background (GdkWindow      *window,
                                 const GdkColor *color)
 {
-#if 0
   GdkWindowObject *private = (GdkWindowObject *)window;
   
   GDK_NOTE (MISC, g_print ("gdk_window_set_background: %p: %s\n",
@@ -1874,15 +1873,6 @@ gdk_win32_window_set_background (GdkWindow      *window,
                           _gdk_win32_color_to_string (color)));
 
   private->bg_color = *color;
-
-  if (private->bg_pixmap &&
-      private->bg_pixmap != GDK_PARENT_RELATIVE_BG &&
-      private->bg_pixmap != GDK_NO_BG)
-    {
-      g_object_unref (private->bg_pixmap);
-      private->bg_pixmap = NULL;
-    }
-#endif
 }
 
 static void
@@ -1891,15 +1881,7 @@ gdk_win32_window_set_back_pixmap (GdkWindow *window,
 {
   GdkWindowObject *private = (GdkWindowObject *)window;
 
-  if (private->bg_pixmap &&
-      private->bg_pixmap != GDK_PARENT_RELATIVE_BG &&
-      private->bg_pixmap != GDK_NO_BG)
-    g_object_unref (private->bg_pixmap);
-
-  if (pixmap == GDK_PARENT_RELATIVE_BG || pixmap == GDK_NO_BG)
-    {
-      private->bg_pixmap = pixmap;
-    }
+  /* TODO_CSW? but win32 has no XSetWindowBackgroundPixmap */
 }
 
 static void
@@ -3594,13 +3576,6 @@ _gdk_windowing_window_get_input_shape (GdkWindow *window)
   return _gdk_windowing_window_get_shape (window);
 }
 
-static void
-_gdk_win32_window_destroy (GdkWindow *window,
-                          gboolean   recursing,
-                          gboolean   foreign_destroy)
-{
-}
-
 static gboolean
 _gdk_win32_window_queue_antiexpose (GdkWindow *window,
                                    GdkRegion *area)